HighOctane (Person working on it: philippeback) Bug fixes in 6.x LTS series. Committing back generic changes from the work done for Socius.be